# This is a BitKeeper generated patch for the following project:
# Project Name: Linux kernel tree
# This patch format is intended for GNU patch command version 2.5 or higher.
# This patch includes the following deltas:
#	           ChangeSet	1.1104  -> 1.1105 
#	drivers/input/serio/i8042-io.h	1.4     -> 1.5    
#
# The following is the BitKeeper ChangeSet Log
# --------------------------------------------
# 03/05/30	peter@chubb.wattle.id.au	1.1079.1.43
# [PATCH] ia64: use generic build infrastructure for generating offsets.h
# 
# Delete references to arch/ia64/tools; use standard sed script to generate
# offsets.h.
# 
# This gets the dependencies right for offsets.h
# --------------------------------------------
# 03/05/30	davidm@tiger.hpl.hp.com	1.1079.1.44
# .del-print_offsets.awk~ce325580e04f9929:
#   Delete: arch/ia64/tools/print_offsets.awk
# .del-Makefile~90bde6a95198c56c:
#   Delete: arch/ia64/tools/Makefile
# --------------------------------------------
# 03/05/30	peter@chubb.wattle.id.au	1.1105
# [PATCH] Fix ps/2 mouse and keyboard on I2000
# 
# I finally got sufficiently fed up to fix the PS/2 keyboard.  The
# problem is that the generic code requests an ISA interrupt directly,
# instead of via isa_irq_to_vector().
# --------------------------------------------
#
diff -Nru a/drivers/input/serio/i8042-io.h b/drivers/input/serio/i8042-io.h
--- a/drivers/input/serio/i8042-io.h	Fri May 30 22:15:03 2003
+++ b/drivers/input/serio/i8042-io.h	Fri May 30 22:15:03 2003
@@ -20,11 +20,14 @@
  */
 
 #ifdef __alpha__
-#define I8042_KBD_IRQ	1
-#define I8042_AUX_IRQ	(RTC_PORT(0) == 0x170 ? 9 : 12)	/* Jensen is special */
+# define I8042_KBD_IRQ	1
+# define I8042_AUX_IRQ	(RTC_PORT(0) == 0x170 ? 9 : 12)	/* Jensen is special */
+#elif defined(__ia64__)
+# define I8042_KBD_IRQ isa_irq_to_vector(1)
+# define I8042_AUX_IRQ isa_irq_to_vector(12)
 #else
-#define I8042_KBD_IRQ	1
-#define I8042_AUX_IRQ	12
+# define I8042_KBD_IRQ	1
+# define I8042_AUX_IRQ	12
 #endif
 
 /*